From 48129298f00bf2f05f4b69627fa6cc8ee65cdb0f Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Wed, 5 Apr 2023 11:49:26 -0300 Subject: [PATCH] gsk/vulkan: Use default blend factors Vulkan renders text using VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA and VK_BLEND_FACTOR_SRC_ALPHA, but that implies per-channel alpha blending, which currently produces the wrong results when blending glyphs with the images beneath them. Use the default pipeline constructors, which implies using the ONE and ONE_MINUS_SRC_ALPHA. --- gsk/vulkan/gskvulkancolortextpipeline.c | 3 +-- gsk/vulkan/gskvulkantextpipeline.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/gsk/vulkan/gskvulkancolortextpipeline.c b/gsk/vulkan/gskvulkancolortextpipeline.c index 295cf53339..4a4aded9d7 100644 --- a/gsk/vulkan/gskvulkancolortextpipeline.c +++ b/gsk/vulkan/gskvulkancolortextpipeline.c @@ -81,8 +81,7 @@ gsk_vulkan_color_text_pipeline_new (GdkVulkanContext *context, const char *shader_name, VkRenderPass render_pass) { - return gsk_vulkan_pipeline_new_full (GSK_TYPE_VULKAN_COLOR_TEXT_PIPELINE, context, layout, shader_name, render_pass, - VK_BLEND_FACTOR_SRC_ALPHA, VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA); + return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_COLOR_TEXT_PIPELINE, context, layout, shader_name, render_pass); } gsize diff --git a/gsk/vulkan/gskvulkantextpipeline.c b/gsk/vulkan/gskvulkantextpipeline.c index 41e40f1395..e9551f458b 100644 --- a/gsk/vulkan/gskvulkantextpipeline.c +++ b/gsk/vulkan/gskvulkantextpipeline.c @@ -88,8 +88,7 @@ gsk_vulkan_text_pipeline_new (GdkVulkanContext *context, const char *shader_name, VkRenderPass render_pass) { - return gsk_vulkan_pipeline_new_full (GSK_TYPE_VULKAN_TEXT_PIPELINE, context, layout, shader_name, render_pass, - VK_BLEND_FACTOR_SRC_ALPHA, VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA); + return gsk_vulkan_pipeline_new (GSK_TYPE_VULKAN_TEXT_PIPELINE, context, layout, shader_name, render_pass); } gsize -- 2.30.2